Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 7 Jan 2010 23:49:52 +0000 (23:49 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 7 Jan 2010 23:49:52 +0000 (23:49 +0000)
commitf1c0eba607e56039084995d0798b55af40907bc1
tree3b313b62c009eca40f603d4f40cd14d3e0aa53cf
parentf4374ae80f8deec72ad85bd0ddc6374045271e39
parent4c88dae1ece148d101dc465a19bb68721868982b
Merge from mainline.